Skip to content

Fix layout xml and page layout caching issue on redis cluster under high load#22763

Closed
andrey-legayev wants to merge 5 commits intomagento:2.2-developfrom
ven-com:layout-cache-fix-2.2.7
Closed

Fix layout xml and page layout caching issue on redis cluster under high load#22763
andrey-legayev wants to merge 5 commits intomagento:2.2-developfrom
ven-com:layout-cache-fix-2.2.7

Conversation

@andrey-legayev
Copy link
Copy Markdown
Contributor

@andrey-legayev andrey-legayev commented May 7, 2019

Description (*)

Bugs which were fixed:

  • $this->pageLayout was not checked after reading from cache, but was used as is
  • two cache items were used in once place instead of one (performance impact)

Changes:

  • replace 2 cache items by 1 - it should improve performance
  • add "_MERGED" to cache key suffix to have compatibility with old cache keys during deployment of new version

Fixed Issues (if relevant)

  1. Layout corruption with php-fpm (a Magento 1 problem returns) #6942 Layout corruption (Title is wrong, but issue is real)

Manual testing scenarios (*)

N/A

Contribution checklist (*)

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • All automated tests passed successfully (all builds on Travis CI are green)

@andrey-legayev
Fix layout xml and page layout caching issue on redis cluster under h…
731c107 
…igh load

Bugs which were fixed:
 - $this->pageLayout was not checked after reading from cache, but was used as is
 - two cache items were used in once place instead of one (performance impact)

Changes:
 - replace 2 cache items by 1 - it should improve performance
 - add "_MERGED" to cache key suffix to have compatibility with old cache keys during deployment of new version
@andrey-legayev
Fix code style
b59e8ba
@andrey-legayev
Make checking return value of cache load less strict in \Magento\Fram…
52e0fc8 
…ework\View\Model\Layout\Merge
@andrey-legayev
Fix unit and integration tests for \Magento\Framework\View\Model\Layo…
18464a9 
…ut\Merge
@andrey-legayev
Add more unit tests for \Magento\Framework\View\Model\Layout\Merge
9256ed0
@m2-assistant
Copy link
Copy Markdown

m2-assistant bot commented May 7, 2019

Hi @andrey-legayev. Thank you for your contribution
Here is some useful tips how you can test your changes using Magento test environment.
Add the comment under your pull request to deploy test or vanilla Magento instance:

  • @magento-engcom-team give me test instance - deploy test instance based on PR changes
  • @magento-engcom-team give me 2.3-develop instance - deploy vanilla Magento instance

For more details, please, review the Magento Contributor Assistant documentation

@magento-cicd2
Copy link
Copy Markdown
Contributor

magento-cicd2 commented May 7, 2019

CLA assistant check
Thank you for your submission, we really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
4 out of 10 committers have signed the CLA.

✅ sidolov
✅ magento-engcom-team
✅ shiftedreality
✅ StasKozar
❌ maiorange
❌ OlgaVasyltsun
❌ dhorytskyi
❌ rostyslav-hymon
❌ svitja
❌ viktym

@orlangur orlangur self-assigned this May 7, 2019
@orlangur
Copy link
Copy Markdown
Contributor

orlangur commented May 7, 2019

@andrey-legayev you need to create a new branch out of 2.3-develop, apply your changes on top with cherry-pick or something and then force push to layout-cache-fix-2.2.7.

@orlangur
Copy link
Copy Markdown
Contributor

orlangur commented May 7, 2019

@andrey-legayev ow, this is a base branch for #22625 also and this cannot be changed. Please create a different base branch for 2.3.x PR.

@orlangur orlangur closed this May 7, 2019
@m2-assistant
Copy link
Copy Markdown

m2-assistant bot commented May 7, 2019

Hi @andrey-legayev, thank you for your contribution!
Please, complete Contribution Survey, it will take less than a minute.
Your feedback will help us to improve contribution process.

@orlangur orlangur reopened this May 7, 2019
@ghost ghost unassigned orlangur May 7, 2019
@orlangur orlangur changed the base branch from 2.3-develop to 2.2-develop May 7, 2019 11:30
@orlangur orlangur self-assigned this May 7, 2019
@orlangur orlangur closed this May 7, 2019
@m2-assistant
Copy link
Copy Markdown

m2-assistant bot commented May 7, 2019

Hi @andrey-legayev, thank you for your contribution!
Please, complete Contribution Survey, it will take less than a minute.
Your feedback will help us to improve contribution process.

@andrey-legayev
Copy link
Copy Markdown
Contributor Author

andrey-legayev commented May 7, 2019

no problem, I just couldn't fix it because of github outage...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@orlangur orlangur

Labels

Component: AdminNotification Release Line: 2.3

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@andrey-legayev @magento-cicd2 @orlangur @magento-engcom-team